From: Mathieu Malaterre <malat@debian.org>
Date: Mon, 6 Nov 2023 11:04:04 +0000 (+0100)
Subject: d/patches: Fix install path for docs
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~41
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=2318cc4408f02ccce8e7d1795b90af7add501527;p=dcmtk.git

d/patches: Fix install path for docs
---

diff --git a/debian/dcmtk-doc.doc-base b/debian/dcmtk-doc.doc-base
index eb33f9e6..761ca1fc 100644
--- a/debian/dcmtk-doc.doc-base
+++ b/debian/dcmtk-doc.doc-base
@@ -8,5 +8,5 @@ Abstract:  This manual comprises the complete on-line documentation for the
 Section: Science/Medicine
 
 Format: HTML
-Index: /usr/share/doc/dcmtk/dcmtk/html/index.html
-Files: /usr/share/doc/dcmtk/dcmtk/html/*
+Index: /usr/share/doc/dcmtk/dcmtk-3.6.8/html/index.html
+Files: /usr/share/doc/dcmtk/dcmtk-3.6.8/html/*
diff --git a/debian/dcmtk-doc.docs b/debian/dcmtk-doc.docs
index 470bae5f..9c1434e7 100644
--- a/debian/dcmtk-doc.docs
+++ b/debian/dcmtk-doc.docs
@@ -1 +1 @@
-usr/share/doc/dcmtk/
+usr/share/doc/dcmtk-*/
diff --git a/debian/patches/remove_version.patch b/debian/patches/remove_version.patch
index 033fced9..f306239b 100644
--- a/debian/patches/remove_version.patch
+++ b/debian/patches/remove_version.patch
@@ -7,16 +7,14 @@ Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
 ===================================================================
 --- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
 +++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
-@@ -180,9 +180,9 @@ else()
+@@ -180,8 +180,8 @@ else()
  
    # Modify the installation paths for configuration files, data files and documents
    # by adding a subdirectory with the DCMTK name and version number
 -  set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
 -  set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
--  set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
 +  set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk")
 +  set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk")
-+  set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}")
+   set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
  
    # These variables are defined as macros in osconfig.h and must end with a path separator
-   set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/")